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

Change-Id: I0bb4e726f75b42f033d99e0606e76a94192325f6