Merge "Bug #74135101 fix NPE in GroupNameEditDialogFragment in monkey test"
am: 7173594e8b

Change-Id: I0e96ba104d56e20267db0f44b8b74a1a556f8df7