Use size_t instead of unsigned int am: 4a74569453
am: 08333b4f40

Change-Id: I607f36e5b26ee2f29ca14937053c1181ea81761d