Issue 539

Fixed API Level selection issues
Merge pull request #596 from blackberry/next-539

Issue 539