Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am: 39a556f1d8

Change-Id: I51580faadf97d828d5b2c4d7adba99cd7d36d4f2