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

Change-Id: Idd341f7969c40184327428fc27b9f597dab57905