am 5e783896: Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev

* commit '5e783896a20aeef2cf253331b7db245eade04b64':
  Fix PhoneAccount parceling (1/2)