Reconcile with ics-mr1-release

Change-Id: I346d26fa31276a6e94ceccd25b6bb953e7305c43