Fix "conversion from size_t to int" warning.

Change-Id: I7f5a411eeafe90f535ff3555ad3d08a8f213a405
Merge topic 'sizet-to-int-warning' into master

456a8ff7 Fix "conversion from size_t to int" warning.