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

Change-Id: I1bd23f1a249d66de8b0b32d8ef0ea0a5ca47f04c