Merge "Update scrubber assets" into ics-mr0