Reconcile with ics-mr1-release

Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436