Merge "bug fix: restore support for broken flag" into oc-dev am: 40aad4e988 am: 062192a1be
am: fee5be0064

Change-Id: Ia131796dcc75bb71e0d46477f7e8240731b69ed0