am 9c7caa80: am fd922200: am 83a634a6: Merge "Don\'t confirm if discarding empty message" into ub-gmail-ur14-dev

* commit '9c7caa80648bb2eea76f2c27f1176b90d28ea552':
  Don't confirm if discarding empty message