Merge "Fix build break due to 32/64 bit compilation." into nyc-dev
am: 5fb90f91b7

* commit '5fb90f91b7984e61d57591880bed0257cd35d7da':
  Fix build break due to 32/64 bit compilation.

Change-Id: I26955619bbcce48d5a4379963db4c834a4d802e2