Reconcile with ics-mr1-release

Change-Id: I57d166bfd7b6c4d9aa46c205d216cee93dae5e04