Reconcile with ics-mr0-release

Change-Id: I8ec1540b94c648ec188ca4eab41ff3d631e0876b