Merge "Fix format string warnings"
am: b50a7dcded

Change-Id: I1d730ddbce865daca6160b2542b12a2b1f54daaa