Merge "Change allowed sound triggers to 1000" into pi-dev
am: 1d107eaea2

Change-Id: I2ce6e7d3e2d2db344773b2ed0d26114c68ff18f5