Merge "Rewriting phone constants for mainline" am: 9d604bfc68 am: 1eb300862d

Change-Id: Ide80b956cfb18f4328157f652051e0202695ca50
tree: 10b4d1de4a83fa0778a81906cf30e9c11665fd22
  1. service/
  2. PREUPLOAD.cfg