Merge "Fix atest DocumentsUIGoogleTests fails"