Merge changes from topic "am-2bdda567-72b2-4e25-9a99-dfd3ec839928" into oc-mr1-dev

* changes:
  [automerger] bug fix: restore support for broken flag am: 8d009afdbb  -s ours am: 368589ea3d am: ca1295e93a
  [automerger] bug fix: restore support for broken flag am: 8d009afdbb  -s ours am: 368589ea3d
  bug fix: restore support for broken flag am: 8d009afdbb  -s ours