Merge "Change app selection policy for post-OTA verification" into nyc-dev