Reconcile with ics-mr1-release

Change-Id: Ie677d896709b143687d5ca5e3e382693a41c9264