Merge "Fix broken tests"
am: e8e3d9253f

* commit 'e8e3d9253fefffd843b42b1da76b37ef65bc100c':
  Fix broken tests