Reconcile with ics-factoryrom-release

Change-Id: Ibaa16006bb0ba1c7e483a3048866a1a0050d2bbc