am 52d952aa: am 36923016: Merge "Fix regression when editing contacts" into jb-dev

* commit '52d952aa4a304b899e79127b12346451a3662216':
  Fix regression when editing contacts