Merge "Allow -Wformat warnings before they are all fixed."
am: 01a2d12df3

Change-Id: Ic1d9b840218dc7dee230c500f272fcad75522b0f