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

Change-Id: I7f2eee043702be1a8878851793b9b17bdb89766b