Merge "Fix LinkPropertiesTest on *-user builds" into tm-dev