Merge "Update primary key in VIS sound model database." into nyc-mr1-dev am: c81e1f15d2
am: c6577b1266

Change-Id: I8ce1dfc713ec15be5b2d9814667a5c04ea4d6780