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

Change-Id: I60c54353bdbd57818bcf5bcc47d55328d46ce6b9