am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id...
am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev
* commit '543348eb':
Modify getDeviceId() to get device id independent of Subscription.