Merge "Simplify LinkPropertiesTest." am: e5976a0167

Original change: undetermined

Change-Id: I10a52823752353efa4351dfffef34b9523c9f01b