Second round of comments from code review 987044
Second round of comments from code review 987044

Princessgladys/googleresourcefinder,Princessgladys/googleresourcefinder,Princessgladys/googleresourcefinder