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

* commit '3eaf72dc67ef0911bee0cc0d1db088cb70b044ca':
  Change app selection policy for post-OTA verification

Change-Id: I00ece6027cd8ae3cb513e361853136d7d314adf8