Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: At least get tests compiling properly Change-Id: I0cf2d33e47a8511e11edb3b7ed8a844da7afbb23