am 45a630e8: am d5fc86f0: Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev am: 5c900a6685

Original change: undetermined

Change-Id: Id1b8374d294fc2564d9dec21dd353c2c93904ec2