[eno] Cherry-pick changes to eno release branch v0.2.x#556

ruinan-liu merged 2 commits intoofficial/v0.2.xAzure/eno:official/v0.2.xfrom

users/ruinanliu/cherry-pick-v0.2.xAzure/eno:users/ruinanliu/cherry-pick-v0.2.xCopy head branch name to clipboard