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

Change-Id: Ic7292dd6fd052c7a811d0d097e84b65b49855b3d