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

Change-Id: I160a9aaf97354e00d711f9e9dd295bb418b0b151