Merge "Enable profile merging for post-OTA package verification" into nyc-dev