Merge "Don't do heavy work on UiThread." into oc-dev am: 881a623e35
am: 97b8852deb

Change-Id: Ic3993b9a66a7ecb08b65ce3857d64557584cd970