Reconcile with ics-factoryrom-release

Change-Id: I5b9b2250b49befd6afd87ed426c4883e006bf292