Merge "Parcelable classes should always be final." into nyc-dev