Use shortcut references to globals

Change-Id: I9529d4cb169b855af204142266dce7fc0aa52064
Merge "Use shortcut references to globals"