Use canonical class name, remove unused globals.

Change-Id: I94cf491e4c1c793f455fd597b383f8133b0aace3
Merge "Use canonical class name, remove unused globals."