Merge branch 'stable-3.1'

* stable-3.1:
  Make persistent task keys stable

Change-Id: Ib61c40b85aed499781ad3867896a45a08035dfef