Merge "Fix declaration for softkeymaster_module"