Remove use of global

Change-Id: Ie6836b73c39cea314bbc1c32fb1b66b76fba7ca7
Merge "Remove use of global"