Merge "Move default sounds to /product"