Merge "Fix the Locale story in the hotword API" into lmp-dev