Reconcile with ics-mr1-release

Change-Id: Iaa494a9536a8a244bcb4050d78e7dc15dc8460f0