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

Change-Id: I8b53612e8716233b444a28882028cfb94cb56e0a