Fix global var access

Change-Id: If5cd1954cd078a86e1bceb3e87f0b9261ccee9a2