Merge "Adjust AsyncTask.THREAD_POOL_EXECUTOR config" am: 2b56c4cf48 am: e0203aa6ec
am: 4e85978e38

Change-Id: I357362798b25eb2e98a806dc309b742c954244fa