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

Change-Id: I875a1c2764db6ceee5a71830395ffc36ae4f1dd5