Merge "Update to use the correct library for logging." am: f5e1ac67ed
am: 34d006ee9c

Change-Id: Ib0d77e4267966729600f581309900de5cd8dd780