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