Comarostaphylis species- California, USA

Comarostaphylis arbutoides from California-GS15022020-2 : 17 posts by 4 authors. Attachments (3)
Comarostaphylis arbutoides L.                   
Evergreen shrub to small tree with lanceolate, elliptic to obovate leaves with entire or serrate margins, pale yellow to white flowers in panicles.
Clicked from University of California Botanical Garden, April 22, 2019.

yes. one of the manzanitas preferred as foundation plants around houses, in the past.
dont know what the millennials are planting around their houses nowadays.

I rarely disbelieve a UCBG label, which is managed by professionals and numerous botanists visit every day.
Attachments (1)

i have learnt never to doubt them. but NYBG is also very good.
may be they can look at these pictures and compare them to their own, ...??
Thanks, ... Can not say, but here are the links:
May be this should be helpful
C. diversifolia: mature fruits red, calyx lobes lanceolate or narrowly triangular; inflorescences usually gray-tomentose.
C. arbutoidesMature fruit black; calyx lobes usually triangular or ovate-triangular, inflorescences glabrous to variously pubescent, but not gray-tomentose.
here is link to infl. of C. diversifolia
I am attaching image of part of infl. in my plant
A better lighting view.
Attachments (1)

Thanks, ... So what is the final id ?

Comarostaphylis arbutoides for me 

If so, than I have to look for such leaves on net.
I found your flowers and leaves more closer to Comarostaphylis diversifolia
You seem to be inclined towards C. diversifolia because it isthe only commonly cultivated species. But we should not forget that this plant is from UCBG where plants from different parts of the world are grown and maintained. I don't expect even 1 % that botanists of such a renowned Garden, where hundreds of botanists visit, would have put a wrong label.  

A better view of Leaves and inflorescence.
Attachments (1)

My doubt is about the leaves. Pl. find any authoritative link where you can see such serrated leaves.
I checked on net and I am not finding it anywhere. Pl. see
GBIF (specimens)