Merge "Fix soundtrigger test, adds null pointer check" into nyc-dev