DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings am: 8c9e4b68f0  -s ours am: f3b4c26453  -s ours am: 5b4a49ea37
am: dcede2d2d6  -s ours

Change-Id: Ic511ed8370c3a388bdc77f064cbe25bc434d927d