Reconcile with ics-mr1-release

Change-Id: Id7a5204b76531ee8295091a8b01d75037d150c94