Merge "Correcting issue where businesses with business photo URLs show a person avatar until the photo loads."
tree: 39dafd69aebb7188e2172569851588fccbbeaf33
  1. src/
  2. TestCommon/
  3. tests/