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

Change-Id: I296c29bdbb21fcf672f4d9262f6ba72842fe6258