Merge "Fix singleUser provider grants" into lmp-mr1-dev
automerge: 775d104

* commit '775d104db29dc8bdd8922fd7627cf646869d90c8':
  Fix singleUser provider grants