Reconcile with ics-factoryrom-release

Change-Id: Ifd0dc59d4f94017f6a5f119fe85a2d4d7d7f4278