Merge "Remove dead local var in ApiQueryUserInfo"