Merge "Implemented a new manually network selection API" am: 7a1f37a5cd
am: 870ecb3db7

Change-Id: I743d300f2b505fbaa6c5458eab8a829dc7264402