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

Change-Id: I55b2005d6bf47944255ce5f83f612ed915821375