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

* commit '87245037687c830796d713f66da8d5cc3fcca019':
  Fix 64-bit build error