Reconcile with ics-mr1-release

Change-Id: I3591d3f047cab56ed8ae4e12a627dfa4c896533a