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

Change-Id: I1e5172b24c7c444f33b473ddb7a63101a7ff3547