am a4799fc4: am 9d1e1903: Merge "Replace String CharArray with internal uint16_t array."

* commit 'a4799fc466776ea5b4e9663b1e63af4d224a6865':
  Replace String CharArray with internal uint16_t array.