Reconcile with ics-mr1-release

Change-Id: I91ffc584e0d2d39aaec9b28ac3cde8b625234968