Reconcile with ics-mr1-release

Change-Id: I89b1421563c2b3e43421e1a8c04b484b450f5327