Merge "Check permissions on getDeviceId." into mnc-dev
am: 4557ef32fe

* commit '4557ef32fe36b6f7ef7918052400d18af51d452f':
  Check permissions on getDeviceId.