Reconcile with ics-mr1-release

Change-Id: I286607d4bc4441a379d78c2a0cdb166e41dc47ee