Reconcile with ics-mr0-release

Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b