GeneratedPropertyContainer returns the original container

Change-Id: Ia766f1e989d6a06d4b1746b0612c090b6fbd2735