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

Change-Id: If6f252e49c0bfd58ab8dca92ae911f433725f872