fix some bug(middle version)

Change-Id: I45489c5dc80b49067448d21510c981a8b69ed8f1
Signed-off-by: levi <liwei_snake@163.com>