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

Change-Id: Ia13a3334e363c57baf3838b2ead1e71ca28e859d