Fixed missing imports to allow keyboard save
Merge pull request #188 from jvc26/feature/fix-keyboardapi-1

Fixed missing imports to allow keyboard save
Bring upstream changes into keyboard-api2