Reconcile with ics-factoryrom-release

Change-Id: I440232e29e1c09261f74d3c408a3afe50d8798ad