Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d
am: e5eb4567d4

* commit 'e5eb4567d408808873d7193fcaf7bfea859ea725':
  Honor TARGET_NO_RECOVERY flag.