Reconcile with ics-mr1-release

Change-Id: Ibe6997bc5295b3deb615e8f51f73a1639d0f3235