Merge "Fix clang compiler warnings."
am: 7553b18b49

Change-Id: I60abdc7bbde7008a0b058495febd6f3d3bf75031