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

Change-Id: Ie56397db6e32008b7998cd4a65ddaabfb86bf31f