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

* commit '4c1d9480f44120543b0c1ed8ea04b6a22b55011b':
  Allow codepath changes for new OTA packages