automerge: cf8ae79 * commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b': Change getDeviceId to take phoneId.