am cb1e18da: Merge "Remove location permissions" into mnc-dev

* commit 'cb1e18da0de89549c2a512ee9887f15f4976d8ff':
  Remove location permissions