Reconcile with ics-mr1-release

Change-Id: I34e85decafe03a386047d24576ed1832511a48cc