Fully qualify global variables

Change-Id: I63639eb5eeaaeab5d1c9d7f97c3499defb925a7b
Merge "Fully qualify global variables" into production