Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev