Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" am: cdbf930883
am: a93e4124b5

Change-Id: I0f67a737f418d105658763e21974dc60216aee1a