Reconcile with ics-mr1-release

Change-Id: I939f27b0ec63aa664bd606bd6ac7af4433d67c18