Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Avoid KeyUtil internals for better encapsulation

Change-Id: I12d102f14697b50a9a94b989b7ff71eabc0e2189