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

Change-Id: I7d1f4556e7a21869f0c1a55a4c5765d66b4763ea