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

* commit '9b40edab61ca9bf3b9f5931bbfc266eb6c6216e6':
  Revert "Enable profile merging for post-OTA package verification"

Change-Id: Id80d04e153b9a529f75bd518db3f611fc1c96aa1