Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix test dependencies for in-tree build

Change-Id: I44e6cabd7f0a414888013bec1eb1b979bed5b7d4