87e32fbb8d
Reviewed-by: Steve Loughran <stevel@apache.org> Reviewed-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit c70ee2d548feb9ec9a957e120045983dd21d9964)