Merge "Enable starting window logging" into oc-dev am: 5616c5f610
am: 682cd21187

Change-Id: I36e3fbd30d52446a7c3f281da28041ba0fa6e7d1