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

Change-Id: Icfa3b57630a6d8d31f68f7d11d09e7ee0b97cc73