am ae18171a: Change certificate policy.

Merge commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad' into froyo-plus-aosp

* commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad':
  Change certificate policy.