Merge "Fix privacy tags based on go/irpf." into pi-dev