Merge "Removed @hide and Parcelable hierarchy"