Merge "Fix format string warnings" am: b50a7dcded
am: b210ec3fea

Change-Id: Ie1b30a4c0397655ea574265a7fb3f78f21f5fe87