Merge "Add measurement of linkage pairs"
am: e9dce6a280

Change-Id: I33d667da12869d3b86b17d9b17f9cd38e05f06cc