Merge changes from topic 'fix-broken-tests'

* changes:
  Submit: Set correct patch set on approval when submitting new patch set
  Fix broken SubmitByCherryPickIT