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

Change-Id: Ifbadd85a785ad77fb9ab5817fc87cb70baf19a20