Merge "KeyStore: Update the parameters of generating master keys." into gingerbread