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

* commit '676bf9ff6863c8f48031bb84402fb669fb5a7247':
  Clean-up some compiler warning messages.