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

Change-Id: I0fe4f5d00a48f63fb38a9600fac1acd3b5f79ce1