am 085c288f: Merge change 6819 into donut

Merge commit '085c288f87389fd08295a941e568a56fd2f11a00'

* commit '085c288f87389fd08295a941e568a56fd2f11a00':
  Use correct photo when building direct-dial shortcuts.