Merge \\\\"Remove an abused global so we can actually see logging.\\\\" am:...
Merge \\\\"Remove an abused global so we can actually see logging.\\\\" am: 37450d7f am: 4692e5d8 am: d71cf2ee
am: 2ccce052
Change-Id: I03e970256bb58a9a4f7004dae4f5fa29b09e8a3c