Manually merge commit 'f35e6a6c9162d765f37aac33a99bc606bd31fecc'

BUG:36363084