Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 2ddbe4c8af am: f7eb87cebd

Change-Id: I30ad926d5c45cdcb2ddae32e67e4b5c0cd561884