Merge "Revert "Revert "new System API for preferred network mode"""