Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 4beb9d1338

Change-Id: I7cbc274cbe3bacd568223977556641488deea834