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

* commit '628b8f1f5f6d249e2f222602352d14c40d648d97':
  Check permissions on getDeviceId.