am c3e4f0a7: Merge "Rename drawGeneralText to drawText" into jb-mr1-dev

* commit 'c3e4f0a72baff805b434fd6b24cb29b3dc68e98d':
  Rename drawGeneralText to drawText