Merge branch 'stable-2.15'

* stable-2.15:
  Fix dependency management for tests

Change-Id: Ic357778c1eefc7465b5dbd9fe4de0c8674182b18