Merge \\"Remove an abused global so we can actually see logging.\\" am: 37450d7f42
am: 4692e5d8c8

Change-Id: Idf78bf71a0670997da754d0de93691db313aed57