protoproxy: qualify vars

Change-Id: I03872837d7978a685a52abc895560766ca65f1c6
Merge "protoproxy: qualify vars" into production