am 81365081: Merge "Fix bugs on Contact editor." into ub-contactsdialer-a-dev

* commit '81365081af63f8a09cf10613ecd653b3b1ee7e5f':
  Fix bugs on Contact editor.