Merge "Refactor TISM add/remove code"
am: 5041bbde19

Change-Id: I2475a3cbff37248509e21dd058ed8f3d827fefd0