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

Change-Id: I858e42f25da6e964f8b33d9985c36676ef56be02