Merge "Remove comments of privacy.proto to avoid this accidently go to AOSP" into pi-dev