Reconcile with ics-mr1-release

Change-Id: I905b379ef5c5382dfe06a46817e92e3ebced89e8