Reconcile with ics-factoryrom-release

Change-Id: I0889aad04af7434aa750ff2152a4ea7a0d0279e3