Reconcile with ics-mr1-release

Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11