am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev am: c5976600f8

Original change: undetermined

Change-Id: I930ecb2320b1e50707282371b0eacdf60d6e9833