Merge "Move all logging to use the async safe logging." am: d673da4bfb am: b34a9d11ec
am: 8ee90c439a

Change-Id: I829a5fe27fc882adbac636d859b0f2670d6f4251