Remove global registry variable

Change-Id: I7c25006b91fe46224890437f0c710ab5359d47fc
1 file changed