Fix crash in network mode settings

Change-Id: Ia3bec57cab559ebc55fa704d4aae7bb00576c65c
Merge branch 'cm' into HEAD