Merge "Reinstate access to a forgotten member" am: ab6ab9e4d4
am: 2f4bd91b99

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66