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

Change-Id: Ied5003b52d758618cdaa4900a9e36845cebf7e66