Merge "Updates to sound trigger test app." into nyc-dev