am e4030e0b: Merge "Fix several compiler warnings."

* commit 'e4030e0bfc427e755477bbea69afe60308a62d91':
  Fix several compiler warnings.