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

Change-Id: I2bb7c071a71b1d1419204a8a51054d519faa2fad