Merge changes from topic "presubmit-am-8ccaed0a0f764770879d6cb92ae7e46d" into tm-mainline-prod

* changes:
  Fix connection timeout issue
  Fix Correct Package Name