Merge "Fixes wrong id when granting provider access" into rvc-dev am: d3afc9f1 am: b71b7c37 am: 572c5fda Change-Id: I422d3fe712bd46129a5ddc143f86deb060ed6c0b