Merge "Add proto constants for hidden API logging." into pi-dev