[Google] Remove organization property from Contact schema. Fix module merging.