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

Change-Id: Ied23d04f5c38f81ad732424d3577edf4d3cc085d