Rebuild gradle projects
Revert "Rebuild gradle projects"

This reverts commit 76a5ed6b00922417c6db0a21b41ddb8b79a6dd40.
Revert "Revert "Rebuild gradle projects""

This reverts commit cd69583c6207da9026f138e40a9430888e370015.