Merge "[automerger skipped] Merge "Update network selection API" am: 2577e1cf8e am: b7c2507ff4 am: ea098fac95  -s ours"