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

Change-Id: I017784de2ed74437363325cf22064507d3aec63f