Merge "Add isRemovable to slot" am: 6c69d6950b
am: 32984e04a4

Change-Id: I1dff4ce2be98281c9de78cecf16a06a9e7520a5c