Merge "Check permissions on getDeviceId." into mnc-dev