Merge "Remove starting window logging" into oc-dev am: 1e93ad44bc
am: f08ff05438

Change-Id: Icb14b1699d9c5e29467cbae247a6ca9fb95d9780