Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am: 39a556f1 am: b7ac4ca5 am: a41c839d Change-Id: Iefbe36c3f70c941d6986e201bf04bdc1b5f901f5