Revert "Merge branch 'stable-2.14' into stable-2.15" This reverts commit 802d66de2c25647bc8f2d7cc3449b5b9d0488bad. Reason for revert: Wrong branch Change-Id: Ifcb7a551e5bc6fe5baa965cf83ee043fd85dfdf4