Merge "Revert "Remove mobile network settings related declaration""