Merge "Correct the PropertyInvalidatedCache module definition (CTS)" into tm-dev