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

Change-Id: I63d06a3d30ec19fcc0dbe90669248b150c8e99a5