bug fix: restore support for broken flag am: 8d009afdbb  -s ours
am: fecadf319e  -s ours

Change-Id: Ifeb385b59932c25e6c48ce3fd59ac7cde79c1cf7