Merge "Replacing custom parcelables with platform types for test APIs" into main