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

Change-Id: I4d5af4b7ab5bf9de4e103bfb405cbd39bf21d650