Add and remove explicit type conversions

Change-Id: I8b791fda7c64a0363549add99dc9fcae3b29beae
2 files changed