Mark as non removeable as of now

Change-Id: I65e98f6cda0316f234eb959575653707a3bd1673