Merge "Updated code to changes made to GradleSyncListener." into idea133