Merge "DO NOT MERGE Updated Test Expectations" into ics-mr1