v3.0.9
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Make persistent task keys stable Change-Id: Iefda465c739f4669b5394d3c57f7abe0d7513b5f