Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Fix dependency management for tests Change-Id: Ia229ef95fc2a009621494a18ecf156cee757e25f