Merge changes from topic 'am-22b70540-3353-434c-818d-bafe573b7f3e' into ub-launcher3-master

* changes:
  [automerger] Fixing various tests am: 1d7f45d8f8
  Fixing various tests