Fix some unchecked conversion warnings

Change-Id: I5cfb0fceb6ab1d200fb1d7e9849ce458a2aa8ac7
5 files changed