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

Change-Id: I24685ad75f67a59e20190c5dbb28ef43fa5bc8f4