Merge "Remove reference of PhoneConstant." am: 6f82fe83f0 am: 83e2fa8b03

Change-Id: I52bd36fa7085f1915bf4be102af24c1269c1d317