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

Change-Id: I78783a8204b92404405c7bde6f4a0e7e92c72644