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

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