am 81cb0da6: am e7bf184e: am 85588b8a: Merge "Fix testHtmlEncode" into ics-mr1

* commit '81cb0da6d4bcf088ef01d78ab8849223b07bc392':
  Fix testHtmlEncode