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