Reconcile with ics-factoryrom-2-release

Change-Id: If9c35eae1d56a9fc9017c0ae6626466579a4ac96