Merge "Fix clang compiler warnings." am: 7553b18b49 am: e725faa186
am: 6e35f60c43

Change-Id: I0971c80f598eefeaf38500555dfbd44196cd4a70