Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest""