Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove Joda dependency

Change-Id: I676579d29d3bcfb699b4e0dde8286c26cc272ecd