Merge "Removing changes not meant for MR1" into ics-mr1