Merge "bug fix: restore support for broken flag am: 8d009afdbb  -s ours am: fecadf319e  -s ours" into oc-mr1-dev
am: 591caae2ed  -s ours

Change-Id: I80fb7583ad0d69b45ed778a8b9694969fc40d06c