Reconcile with ics-mr1-release

Change-Id: Iee3db1b6efca09a910a8248bfb6ed35d0d5ecef9