Merge "Tweak the HotwordRecognizer API" into klp-dev