Reconcile with ics-mr1-release

Change-Id: I2484dad4a2ab183880aeede3685b6e0bae83ab82