Merge "Upgrade permissions on PermissionController version change" into rvc-dev am: 2a129f696a

Change-Id: I91f0592203e151f5be4829e56cc7a6455ffd2d07