Reconcile with ics-mr1-release

Change-Id: I65bc2670999064c2e3143018b71b5850df4d8988