(cherry picked from commit c600a4b23556442cfcf7734dc212731017bc86a2) GitOrigin-RevId: ac9d9b8c0a86f07533acbc4bba047a475581677b