DO NOT MERGE: Do not synchronize boolean reads/writes am: 94dcb3c3fd  -s ours am: eb98bc95d2  -s ours
am: a63d5e5fd8

Change-Id: I4de7bc73125acad6e45783835a9ec6063b5e260b