Cherry picked from upstream commit e24383436703c9151af1e22652e7d4dbbb52fc15 e243834367 (cherry picked from commit 69107816f1)
e243834367
69107816f1