Manually merge commit '14e2bd586df5be923591f63401dec6722c3f81a8'

* commit '14e2bd586df5be923591f63401dec6722c3f81a8':

BUG:35326265