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

Change-Id: I584346869cce7b2f270fa4e2018868d3dfbcbacb