Merge "Deprecated getDeviceId and added getMeid and getImei" am: ad2e7405ad
am: 9b7d3a86bd

Change-Id: I322d40e7696b34ad93781882120352587ff36363