Merge "Remove unneeded permissions" into klp-dev