Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63 am: 064eb2a7 am: 5d7bb383 am: 50843b17 * commit '50843b17': Check permissions on getDeviceId.