am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev am: abb57909e0

Original change: undetermined

Change-Id: Iafb06216d893daf8559d1cb76248d36ff6ed7b10