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

* commit '0dcdd7fa95c48fa9adc0b6daed4e8aeb11ec8765':
  Speculative fix for losing message body