When manipulating flags, |= rather than += am: f1c79f8dac
am: c41e1fa305

Change-Id: I10367d3b83acce55e3492812fd04cbdf5f0e6e1a