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

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