Merge pull request #1388 from blackberry/master

Merge master to next
Removing unused files.
Merge pull request #1389 from blackberry/next

Next