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

* commit 'b7e92cf344c54af39d44905d5d8a4d9d79f6a5c4':
  Honor TARGET_NO_RECOVERY flag.