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

* commit '6017658a123a4b9e95e66d60687ec4bd9485547b':
  Revert "Enable profile merging for post-OTA package verification"

Change-Id: I9b489b79a95b1d04f69f8dccac280e7eb3f424a1