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

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