am 60506d94: Merge "Fix build break for size_t vs. uint32_t difference."

* commit '60506d94c399dea8b6325000be27b07fed67852a':
  Fix build break for size_t vs. uint32_t difference.