since the only changes to build.gradle are commented out right now, should we leave this out of the merge for now?