am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev

* commit 'd80cf9109aa6b560e473f0197034085ed9062eaa':
  Allow codepath changes for new OTA packages