Reconcile with ics-factoryrom-release

Change-Id: I494a93ba774ff98969c412d4a9f07f21ef683cde