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

Change-Id: I24fc920fc54e4fd5865bc4b77d78b5c4ce919052