am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread

Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e'

* commit 'ab6327bc9ab70f3b4c1f509d038474982772207e':
  KeyStore: Initialize IV correctly.