Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev