Merge change 25432 into eclair

* changes:
  Finish up using Contract phone types for EAS.