Reconcile with ics-mr0-release

Change-Id: Iac50ef267d3cef8ea4b8c4664d16c9d17e48ed23