Also fixes ARM assert build -O3. Change-Id: I52bda91308ecfa0e8b23c4140c38c49347cc10f7
Change-Id: Ib64cef83a646bce2b0afa72b607fb9e5c306e859
Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9