Merge branch 'stable-3.7' * stable-3.7: Rename ChronicleMapCacheTest to ChronicleMapCacheExtendedIT Split cache-chroniclemap ITs into a separate build targets Adjust cache-chroniclemap to new metric sanitization scheme Change-Id: If6c600e49ce9d8e08365bc0aa143623a8fd1a033