Merge "Fix broken window flag" into oc-mr1-dev am: 07d0b93914
am: e9c5d8aad6

Change-Id: Ifb11ae36366fee42a2eed731584351c93d438d7c