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

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
tree: 0eafe407d54b783dba50bbbabba7c15337135cef
  1. core/
  2. services/
  3. tests/