Merge "Add and update some hotword detection metrics" into tm-dev