backport Ibd85350cda6b511afd3b7a335abe20bd4ac0899e from core

bug: 68694
Change-Id: I82c29bfecd8da017e205b4ca34a98eea61b05601