am 0e2282bc: Merge "Clean-up some compiler warning messages."

* commit '0e2282bc5a58c5778d6c13d15445cea95adb9e37':
  Clean-up some compiler warning messages.