am 5db72e33: Merge "Add CTS test to verify that custom properties of injected...
am 5db72e33: Merge "Add CTS test to verify that custom properties of injected Java object are cleared on reload" into klp-dev
* commit '5db72e33':
Add CTS test to verify that custom properties of injected Java object are cleared on reload