Merge "Fix build breakage" into nyc-dev
am: f76535cd4a

* commit 'f76535cd4a9bea37b75f986126d0f5aa300a76d9':
  Fix build breakage