Reconcile with ics-mr1-release

Change-Id: Ib912870641c7efedd4c01066f0e86dd3f85aaa2d