Merge "Hide APIs for simplified network settings." into lmp-dev