Merge "Refine condition for starting window skip" into oc-dr1-dev
am: 612de053b8

Change-Id: I687dad0a2177c8235e0a2acfd574a92a2a5cd6bb