Merge "KeyStore: return null instead of empty list"