Reconcile with ics-factoryrom-release

Change-Id: Ie3d828b77b539c41d89b2a7e4057fea9e527dac8