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

Change-Id: I8f116251cca6d5e4d783f50f8386cec80dc6853f