Merge "Update to use the correct logging library." am: 48f6298fa3
am: 82c7db6e9f

Change-Id: I3a93b0eeba305c55d3304c9ae6fbdc3952b85aeb