Reconcile with ics-mr1-release

Change-Id: I04a6f05c85ac8185bb1c56fbc25d6af97d423123