Merge "Update the preferred network type APIs." into lmp-dev