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

* commit '5db72e336a4287174a6e78e0ed3466a7b05ed779':
  Add CTS test to verify that custom properties of injected Java object are cleared on reload