Fix Typecasts

Change-Id: Ieaccaf695bb96fccfe3d6706910b8c00b0d9b411
4 files changed