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

Change-Id: Id02582c55ed51dfbe007967a74bcacc1d3b76c42