tree aa93237317b00f224a730eed557938320e9b41d8
parent b74aa5991d8e79cd26d1e4407cf98a3945a187cc
parent a2f18cffc96dde7edace9538a117e446d4108d5c
author Josh Wu <joshwu@google.com> 1664528749 +0800
committer Josh Wu <joshwu@google.com> 1664528749 +0800

Merge upstream commit 'a2f18cffc96dde7edace9538a117e446d4108d5c' into master

Test: atest avatar
Change-Id: Ie8e172c614e6e20ed8e74d894e90fcae755a108e