[liuxia] Housekeeping commit.