Bug 55663 - AttributeError: 'module' object has no attribute 'NullHandler'

Change-Id: If5530756135827d4c3874f00dfd0740326930783
Merge "Bug 55663 - AttributeError: 'module' object has no attribute 'NullHandler'"