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

Change-Id: Id8dacf8a867b091c7a97e1af49cf5006acdc4c56