Reconcile with ics-mr1-release

Change-Id: I846571d58584c9f58a20e8c9d1b144a93801c834