Merge "Try to deduplicate observer iteration code"
am: c8223d0874

Change-Id: I89c4fe6c7c669b7e84c67d0bed9cc97da09cffd0