backport Ic8ef2868ef9c55a1cec57a17f5601652918a62c7 from core

bug: 55161
Change-Id: Ib5def7736b3ed7f682e880438ab21d5f5253ce6e