Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev