Reconcile with ics-mr1-release

Change-Id: I7c31409444255ead260a7fa6969d04c309c9f50b