Merge "Fix LinkPropertiesTest on *-user builds"