Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."