This commit can be cherry picked to 6.0 only if we also cherry pick f8660233. (cherry picked from commit c37acb82)