Merge "Add privapp permissions and whitelist xml files"