Merge commit '8206aa0a93da8c941547494975b06dee90dcc5c5' of sso://googleplex-android/platform/packages/modules/Connectivity into HEAD
Change-Id: I3c19f89d5c5a66ad2d46e05895049e7e8ca9cb36