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

* commit '321bdf20935da07ca472ec90cdf1a55a6f9842ac':
  Remove location permissions