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

Change-Id: I0108b77fc453635f27ba445bdae8316fb60b36b4