Merge "Add more privacy tags." into pi-dev