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