Deprecate global variable

Change-Id: I4dafa0aacfe81744ee9c0c03c8c5a6dba01b0691
Optimize imports

Change-Id: I516216320d92edd925ce2784d9b0800de534ced1