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

Change-Id: I1b195a6baba885a7118c077cd3dbf8b0176df8fa