fix bugs

Change-Id: I1a0ef6a566ee9ff8e161a567a2cbf1c776ffa444
Merge branch '0.4.x' of ssh://pomelo.com:29418/pomelo into 0.4.x
Merge branch '0.4.x' of ssh://pomelo.com:29418/pomelo into 0.4.x
fix bugs

Change-Id: I61e66d65aee5257e2d94c814b4bbab0cc71c90b4
resolve conflicts

Change-Id: I1b33214d6bf870fe710d1fdb57aee18158caaf00