am 1612eac0: (-s ours) am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev

* commit '1612eac06df6ce849cb95935c70ba94093f8d321':