Allow synchronous modification of update listeners list am: d75c1da9c7

Change-Id: Iddd63e2f0f1cd09d3b81be1b9949c004a5dae84c