[automerger skipped] When manipulating flags, |= rather than +=
am: cdc003dc8a  -s ours

Change-Id: I78bec54b65e2b56b54b6c10ac4905ced3a39479c