Fix Typecasts

Change-Id: I496fb6fafe40a16d93ad8880a07a2e9fe01a25e3
6 files changed