Reconcile with ics-mr0-release

Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445