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

Change-Id: I395488e5a7184399a9b2dfa9f2fb5d4ce56b9f47