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

Change-Id: I7a909e13cc388dc21ace392dd7722466fec3cafd