Reconcile with ics-mr1-release

Change-Id: I5553166d3df57d850f576995d0cb5e162e4eccee