Merge "Revert "Allow -Wformat warnings before they are all fixed."" am: efa3988e10 am: 5fc1084850
am: 2a69badf29

Change-Id: Ia5315865157d47323c6972ab31e95777efc8fa4c