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

Change-Id: I3b5e596034d8f5078dac107d754aec0f77d9ba89