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

Change-Id: I1b96696556a49faab4d003c71e78efda823da193