Reconcile with ics-mr0-release

Change-Id: If616230fd56a36580eefa6f709f8f5dc2d12e1f2