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

Change-Id: Id001b164a7eca7b4e681eefbadf4b87bb1f7dbd1