Merge "Modify ContextHubInfo to implement Parcelable"