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

Change-Id: I04caef75a2208f9f98257ae85c7b7d92311d06d1