Merge "Refactor TISM add/remove code" into oc-dev
am: c0af382a25  -s ours

Change-Id: I20a865bc4e652757acfe2c7a6680fdc2b4f5ea2a