Merge "Fix typecast" into pi-dev
am: cc10275934

Change-Id: I552211a2c2de95f132b817058ed820bde8baa611