Reconcile with ics-mr1-release

Change-Id: Id3629feac35e35922942a6d04e741e72b95fded4