Add globals that were removed in rebase.

Change-Id: Ibd908f99b38cd717a2f0b4930aaf5bba86d61fcf