Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" into pi-dev
am: 9b50f67fff  -s ours

Change-Id: I7d2fbef4c7b8cbf6b989cfcc01a2cfc31880f87e