am 5444c35b: Merge "Check CtsVerifier Feature Count" into froyo

Merge commit '5444c35b68d11d44d979b98eb8a493b5fa588e09' into froyo

* commit '5444c35b68d11d44d979b98eb8a493b5fa588e09':
  Check CtsVerifier Feature Count