Merge fixed history of Connectivity

BUG: 189375701
TEST: TH
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I5e5190b50aee85cc238d927f6499cee2e61f5d60