Merge "Implement isRemovable" am: eee18bd546
am: b63abf252b

Change-Id: Ifc5cf98c5b68e994568a6c2aedd3816ccfc274be