Merge "Update network selection API" am: 2577e1cf8e
am: b7c2507ff4

Change-Id: I5aa6f816a2cd449eb3daf1d0fcbf0ffc96488c95