Merge "Fix format-pedantiic warning" am: 57a28821ff
am: 272b39c185

Change-Id: I3b1a497dd5f16b6db2ddf32488908a6a2d9e40c7