am f4de9d84: am 87ed6199: am a0993ab4: Merge "Restore CtsVerifier rate for passive updates" into jb-dev

# By Laurent Tu
# Via Android Git Automerger (2) and others
* commit 'f4de9d84e0b761383a478c7dfc9f54b44e1020f5':
  Restore CtsVerifier rate for passive updates