Merge "Fixing gradle complain on skipping constructor method mid-way" into sc-dev