Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE