Merge "Deprecated getDeviceId and added getMeid and getImei" am: 3942335882 am: 5bfc6df85c
am: 3ae8a382cc

Change-Id: Ie0f9cf74eee543c583a5034ec96d9bfb373c146e