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

Change-Id: I9fc313d80f4177b64724080e63a728fce30e9c3c