Reconcile with ics-mr0-release

Change-Id: I90af2a61f7a2a8b7161cac84d0bb42d5d5d190ee