am e286c04b: Merge "Support for high-resolution contact photos."

* commit 'e286c04b300feb9e4bdd13281a764103c1548323':
  Support for high-resolution contact photos.