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

Change-Id: Ic5aa0c44b4430facc33e11ad9eb9a34b121fe1db