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

Change-Id: I1e39307b7183aefccbd73bbef4e415c181b1f5f8