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

* commit '32eaa6104ed7376e3880fc3d139ed2ef6ac881c1':
  Allow codepath changes for new OTA packages