Merge "[automerger skipped] Merge "Revert "new System API for preferred network mode"" am: 4106e419b2 am: 164774b7bb am: 81462faf05  -s ours"