Reconcile with ics-mr0-release

Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5