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

Change-Id: I44cba662f3306c1f940512204294d2656f80ca0b