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

Change-Id: Ic1bcb3ca011bdc886086f34be18409eb5b12f521