am e7f73ba1: am a1c8fb11: Merge "Move potentially blocking operation out of the activity controller." into froyo