am 0203b9ba: am 1ada7ad6: Merge "Correcting issue where businesses with business photo URLs show a person avatar until the photo loads."

* commit '0203b9bafc90c2aa3f8fe42eeed8e5bcadbacf4a':