Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev am: 6674f7a3b4
am: 897ff1c5ad  -s ours

Change-Id: I1ad2490adc9266aeba0dd0b47c965ba395784106