Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev