Merge "Revert "Enable profile merging for post-OTA package verification"" into nyc-dev am: 9b40edab61
am: 264c5a60f6

* commit '264c5a60f619178a2320e38cdecc5ff1b22ab0de':

Change-Id: Ia50e7df742ba6bb7bd06de4bd73258558342da85