am e4fed421: Merge "build: core: Fix issue in recovery"

* commit 'e4fed421d5939469bf35cd6430300207a0ff4901':
  build: core: Fix issue in recovery