am 50f46fd: am 14da4cc: AI 147896: Some more fixes for tests that failed

Merge commit '50f46fdcf99609da579d08668fe4d3d05aaf6c0c'

* commit '50f46fdcf99609da579d08668fe4d3d05aaf6c0c':
  AI 147896: Some more fixes for tests that failed in