Merge \"Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am: 47c3afa10b am: f2326e947c\" into nyc-mr1-dev-plus-aosp
am: 6548d3ad83

Change-Id: I88c6d7a40488c18e6462325ee4cf1fafc4d57851