Reconcile with ics-mr1-release

Change-Id: Id2458bb7c9fe5f11a0ca6ba498189222bba34b85