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