Merge "Fix singleUser provider grants" into lmp-mr1-dev