c248e12bc4
Signed-off-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Sean Busbey <busbey@apache.org> (cherry picked from commit 92ee19764781f956a8986bf189b60820266af38f)