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

Change-Id: I925fb9574c7b261f8831e60b7afb128d7ef61222