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

Change-Id: I99cd44b7ac4ab41b41d0f1345881dd852c9e5e88