Merge "KeyStore: Initialize IV correctly." into gingerbread