Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev am: d5478d96d7
am: 04f341474d -s ours
Change-Id: I1ad2490adc9266aeba0dd0b47c965ba395784106
This commit is contained in: