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

Change-Id: I320e50928e251d62fcbe852e13c8d87792aad81c