Use Config instead of globals

Change-Id: Iecf6358fcd15fe578b3e0dcdfa6022e0a1a763c8
Merge "Use Config instead of globals"