am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1

* commit 'ff33b94e236fcde3833fba698d32d0e6b98fa303':
  Cleanup static references when quitting.