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