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

Change-Id: Iaa30211db348d52f5cb58c39f775317f7117c2e0