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

Change-Id: I3a48e09dd8e6a86b201c2f683c4a7c209fe6ac81