Merge \"Blame only location observers that actually receive updates\" into nyc-dev
am: 4e85376fe1

Change-Id: I058f0c336974a9b485c674189c97d36f13ec3df1