Merge changes from topic "SoundTriggerJobService-steps" into pi-dev am: 6ed6340e3c
am: 7dd71d4650

Change-Id: I97511eef2e9d15981ac3b6d8d87f5de3cbb680d6