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

Change-Id: If2cce67f40381e3edc8d43a263ea0e5be4af39d0