Merge "Use SystemApi framework parcelables directly"