Merge "Adding option to use new priv-app location for privileged apps."