Merge "Fix PhoneAccount parceling (2/2)" into lmp-mr1-dev