Merge "Add CTS test to verify that custom properties of injected Java object are cleared on reload" into klp-dev