am 61cf065a: Merge "Use a separate policy for the recovery image."

* commit '61cf065ae9247a200208dc7df0234e03caff3605':
  Use a separate policy for the recovery image.