Tweaks from Masa on 4277052.
Tweaks from Masa on 4277052.

Kushal0707/googlepersonfinder,Kushal0707/googlepersonfinder,hugoloza/googlepersonfinder,hugoloza/googlepersonfinder,harshvardhanmalpani/googlepersonfinder,Gentlemanlylad5/googlepersonfinder,Gentlemanlylad5/googlepersonfinder,harshvardhanmalpani/googlepersonfinder