Reconcile with ics-mr1-release

Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92