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

Change-Id: I511f65b0c4013cf408fcbe90089b0fa267dff718