am fd5330c0: am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev

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