Merge changes I640f6470,Idca3ccc6

* changes:
  add java doc for SoundTriggerManager.Model
  fix naming discrepancy in SoundTrigger