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

Change-Id: I82cbbf582216644c073d14ba74360590c1a387b1