Reconcile with ics-mr1-release

Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf