Merge "Configure privapp perms for rotary service" into sc-dev