am c75469e6: am 28369458: am be13ca29: am 6938dc91: am 3f7ed0b4: Merge "Fix html conversion failure check to use trim" into ub-gmail-ur14-dev

* commit 'c75469e649cc2e67e85ae4806290a07e0c94237a':
  Fix html conversion failure check to use trim