am 7d03d950: Reconcile with ics-factoryrom-2-release

* commit '7d03d9508d71de88d32e2f72d9c6ee1526da6c24':
  Re-introduce workaround for issue 3090362