Merge "Fix NPE when casting" into pi-dev am: 9115d371c3
am: 40ee4178f4

Change-Id: I348116fdb5e6ebe5f9c72c53643d4a0d38bafe6f