Merge "Enable profile merging for post-OTA package verification" into nyc-dev
am: 5bc7f5f

* commit '5bc7f5f01bb1dc25e0f1b965afb88d34f0e69890':
  Enable profile merging for post-OTA package verification

Change-Id: Ic899a8ab8160bdac29d44b1f6e31123bf750902c