Merge "Implement isRemovable"
am: eee18bd546

Change-Id: I86f43209be67cf3b93ac3fc1c3059d1967ff5972