Reconcile with ics-mr1-release

Change-Id: Id14659aa3dbffa87ea06ccdf81455c9e83cd9192