Reconcile with ics-mr1-release

Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7