Cherrypick 5c9a962b217faa9366027df1920291c80718019f