Reconcile with ics-mr1-release

Change-Id: I29fa37f396b9098643e723cf88be1af614d3e281