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

* commit '264c5a60f619178a2320e38cdecc5ff1b22ab0de':
  Revert "Enable profile merging for post-OTA package verification"

Change-Id: Ieba2a071abb5927f25bba4047543f11a95f6822d