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

* commit '311fab5291be07fe33ec65240825b4f4bc118fe7':
  Fix build warnings