Import 2 modules

Signed-off-by: shangaijun <shangaijun@yahoo.com.cn>