am a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp

* commit 'a8d15474ebb7b595f842ffb23a36cce9bc382f10':
  ota_from_target_files: Add an option to not sign OTA packages