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

* commit '910ae39f8a12bcb917b7eb1da3f701925da79509':
  Cleanup static references when quitting.