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

* commit '959b55020d4c47ca7e42bece6cd48ef10c1c1c31':
  Allow codepath changes for new OTA packages