Reconcile with ics-mr1-release

Change-Id: I67916d0f93bc18856bfdb3e1f3c15e64fa38df84