fix up network modes

Change-Id: I17573524be0574379ba8768df38242080ccf8e4a
merge changes from Slim kk4.4 into local branch