Reconcile with ics-mr0-release

Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834