minor sdk changes
Merge pull request #7377 from Empatika/master

minor sdk changes