Reconcile with ics-mr1-release

Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5