Merge "Fixing test broken by 159303" into studio-1.4-dev
automerge: 6697162

* commit '6697162c5531bbc89866c9606b92031ae5cb5254':
  Fixing test broken by 159303