Fix prepare timeout problem which will exit the caller and some other changes - #13

Fix prepare timeout problem which will exit the caller and some other changes#13

ericliang wants to merge 10 commits into

helpshift:masterhelpshift/ekaf:masterfrom

ericliang:masterericliang/ekaf:masterCopy head branch name to clipboard