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

Change-Id: Id8c1766a5e1321ce8cc4327aae5677094aa61fb0