Merge "Introduce AlternativeNetwork APIs" am: 98966bcbb6
am: 10211c1f68

Change-Id: Idb3a45b52567451df01afef5e4131a6426b487dc