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

Change-Id: I474a4db75828a2c8063c2761f046df3af07c92b9