Merge "Merge "Add LinkProperties common test cases" am: e62f6c29e4 am: 9fcf3a1d76 am: 6084f24b09"