Merge "Fix format string warnings" am: b50a7dcded am: b210ec3fea
am: 74277cb6f9  -s ours

Change-Id: I65b36fbdf7f37690651fee14d30d0da2e0fd7d81