Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6