Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
am: 47c3afa10b

Change-Id: I4cb74a467a10ee3d38db91fde077263179bf9359