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

* commit '0f49fed7cfcb08221e91f1a6a9934bfbbde970cf':
  build: core: Fix issue in recovery