Merge "Migrate unsafer parcel APIs [2]"