Reconcile with ics-mr1-release

Change-Id: Idbff6b6c73a4e5c68769504f39b47239df431476