am fd6ca57f: am e4030e0b: Merge "Fix several compiler warnings."

* commit 'fd6ca57f24cbfd8a8074ee6f1c22dd973f1b172f':
  Fix several compiler warnings.