Merge branch 'stable-3.12'

* stable-3.12:
  Never throw when describing a queued ITS task
  Describe ITS change events without resolving the patch set

Change-Id: Ie7c1b8b3d20dbb5c082b608b6bb1c97dde03beba