Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2' * commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2': Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2' * commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2': Change CDMAPhone.getDeviceId to return MEID or ESN.