Merge "rm permission from getActiveServiceComponentName" into sc-dev