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

* commit '948a3ed9bc289c17ada0a5eeb9dffb2314e924a5':
  Allow codepath changes for new OTA packages