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

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