Merge \\"Updates to the sound trigger test app\\" into nyc-mr1-dev am: e1fdcc49fd
am: 8ce7b9b6ff

Change-Id: Ib96262c213f9cc397d49b6be6d2ca5975a580ce4