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

Change-Id: I722a103539af432e07daf6303baadc9bad27521c