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

Change-Id: I8846925c094d5f7553e0a597070f728173d391ca