Merge "Location summary is no longer indexed" into oc-dev am: fed6e817a5
am: 53c8d6c2b2

Change-Id: I81c15d76c260969bb53a0c9462db3fabbb31f6cb