Reconcile with ics-mr1-release

Change-Id: I9d8982c6fae0eb770c95f3b480bc6be0976c11b2