Merge "Store the vendor UUID of a KeyphraseSoundModel in the database" into nyc-mr1-dev