Merge "Fix the format specifier in assert log statements" am: ddc10d848a am: 1ffb992d29 am: 7ab599b97c

Change-Id: I2dff3d4a75f8f8f7c6f5ba3074f9324cd6307a3d