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

Change-Id: I080b521922267e596931c119f0870dff357adb0f