Reconcile with ics-mr1-release

Change-Id: I01fb273b93fb7adff59608eb6b7d8395149e3cc0