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

Change-Id: Ide7f8c7558e69535c81f9b732a0af59d4e6ebcb3