Merge "Ignore format-pedantic compiler warning"
am: 52aa495074

Change-Id: Iaf7cd543a307bf9551638ffff902681f1a9a76c5