am 339916e9: am 9673bd56: am 803bbaaf: am cbfbbd35: Merge "Speculative fix for losing message body" into ub-gmail-ur14-dev

* commit '339916e973d32f0446f6f49b1b619c27149c0ee3':
  Speculative fix for losing message body