am fa2cc8db: am eace2add: Merge "Fixing a comment (changing phoneId to subId)" into lmp-mr1-dev

* commit 'fa2cc8db26a477a60c7e20a39154115de5986aa2':
  Fixing a comment (changing phoneId to subId)