Reconcile with ics-mr1-release

Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8