Merge "Fix setEthernetEnabled API to properly affect administrative state" into main