This is required to avoid races with safecopy() at live update time. Change-Id: I1f3e22d40f22d94bd2b850915f9b8163a08b5616
Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9