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

Change-Id: Iab53c4464c872557af38f82f4be1f9e8195cc146