Merge "Avoid KeyedVector and String8 in PropertyMap"