Android N IOT Preview 4 (NIH40E)
Merge "Update references to use PhoneConstantConversion"