Merge "Fix unnecssary traversal for starting windows" into rvc-dev am: 432e0c7440

Change-Id: I6daf891daa066110308158be930bd81a91aa4f10