am 1ce0de89: am 400659f1: am 2549ff53: Merge "Fix NullPointerException in RecipientsEditor."

# By Bin Li
# Via Android Git Automerger (2) and others
* commit '1ce0de891c0677ff1caf39ac41a2b1572d613f62':
  Fix NullPointerException in RecipientsEditor.