Reconcile with ics-mr1-release

Change-Id: Id70fefa35b9a5afa56b5414c86d3cf21c47b9a65