Merge "Fix the format specifier in assert log statements"
am: ddc10d848a

Change-Id: I79f81bbd4c0b4ff22496a0ade4e6cec155965a6a