Reconcile with ics-mr1-release

Change-Id: Id19190393a665dd1b07c073970925758aa383691