Merge "Update ContentInfo to implement Parcelable" into sc-dev