am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE

* commit '585b7acb16183ae31e71912dc2bfceea421be157':
  handle missing constants when creating a Phone instance