Merge "Change app selection policy for post-OTA verification" into nyc-dev am: 3eaf72d
am: 9ada71d

* commit '9ada71dccf73c7d5ab810d9280fc57c8a51bbe18':
  Change app selection policy for post-OTA verification

Change-Id: I6234555ac68127753b071770986f512e48ca30f7