am 0993a89b: am 1c0f94c5: Reconcile with ics-factoryrom-2-release

* commit '0993a89b31eea938b72b925d078f5c68322885f8':