Upstreamed by Commit ID: cf364d100690e635897f48ade769583d19a78ed0