Merge "Fixing Launcher package name for privilege permission" into oc-mr1-dev