Merge "[automerger skipped] Merge "Update network selection API" am: 2577e1cf am: b7c2507f am: ea098fac -s ours"