Reconcile with ics-mr1-release

Change-Id: I3b94d0567dc97c60cfb89e5ab5686781dc05025a