am 3e21d671: am a153336e: am 3102a32e: am 6a304704: Merge "Add null check in JS before replacing message body" into ub-gmail-ur14-dev

* commit '3e21d671ef629cfdfd289f1240c0ce454459f549':
  Add null check in JS before replacing message body