Merge "Upgrade swagger apihandlerinfra"