Rebase to ali1089.

Commit id 51e6599559469b3bedf7956c056644c110dff06a.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>