Merge "Deprecated getDeviceId and added getMeid and getImei"