Reconcile with ics-factoryrom-release

Change-Id: Iec5fbc58aa0d892e8fe3767aad9de7726ec0aa12