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

Change-Id: I8349103fed48e5eafeffa9ea4dfc78cbe82e1d1b