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

Original change: undetermined

Change-Id: Ie33be180badfbf31d1506e9c083929caaf22e8cd