[automerger skipped] Merge "Implement isRemovable" am: eee18bd546 am: b63abf252b
am: ccef577e82 -s ours
am skip reason: change_id I8836e25acf37527bbb067538902de056e1465b31 with SHA1 c8040619e5 is in history

Change-Id: Ie240ad990a67afb46222197188da94dd208e1670