Merge "Deprecated getDeviceId and added getMeid and getImei" am: ad2e7405ad am: 9b7d3a86bd
am: 7da96487ab  -s ours

Change-Id: I14c2cfa9d1b4ba7986393b7aab00abe94d24fce5