[automerger] Merge "Fix typecast" into pi-dev am: cc10275934 am: dd8349be28

Change-Id: I7524b3ff5f6f43935e90042525fa36d1b500e0df