am b00f80cc: am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev

* commit 'b00f80cc6554b9c605a16caf63788647e7501641':
  Add an option to include a full bootloader in incremental OTA.