52d055a7eb
Reviewed-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 51ebf7b2a0e82d8bcd34867aea915c7838541fb7)