Reconcile with ics-mr1-release

Change-Id: I6f1c38b6b4d41113c314449338c67682a48d5456