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

Change-Id: I8ed82272183022a0469011a1f993704ecf771e3f