Merge "Add logging for b10858941."