Updated gradle files.
Merged.
Merged.
Merge branch 'master' into release
Updates.