Merge "update to 0.7.4"
fix pomelo kill bug

Change-Id: I9da73d1c4c1598bfdea02b6f4a3de0a271f58902
Merge branch 'test'