merge in ics-mr1-release history after reset to ics-mr1 am: 0f7eb3a300

Original change: undetermined

Change-Id: Idc096c945f975a3dfc0fcc0da5af8c33db8340da