Merge "Fixing some errorprone build rules" into sc-dev