Merge "Fix privacy tags based on PWG review meeting." into pi-dev