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

* commit '35180b6231025f81e42f6ff5ec761f24a91d30ee':