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

Change-Id: I2893788bbc1c0b50bc62c9094985ccf095161a3d