Merge "Fix build warnings" into nyc-dev am: 311fab5
am: 7b81b7e

* commit '7b81b7e026053615f93af1efc130205eef547e57':
  Fix build warnings