Merge "use a user group instead an email address" am: 8f87a182e6 am: 56c56755b9
am: c96cbe4ae2

Change-Id: I6b509c67436327f3bb381ecf2b378cbe9f26a507