am 6055bccd: Merge "Fix 2 new sets of clang compiler warnings."

* commit '6055bccdffcda19542775c7042a06508cd8f90ca':
  Fix 2 new sets of clang compiler warnings.