Reconcile with ics-mr1-release

Change-Id: I47a9f56fb1e66b1a488e8510aca941ffd26e2ebe