Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Make persistent task keys stable Change-Id: I2cf44bc4e9810c83fa7afee4290fca25dc50724b