am 53d181dc: Merge "Fix 64-bit build error" into mnc-dev

* commit '53d181dcb40f3af83379e9d19e03c0026b90bbf1':
  Fix 64-bit build error