Merge "DO NOT MERGE ICS MR1 Backport of Some Provider Tests" into ics-mr1