Merge "Location summary is no longer indexed" into oc-dev