add remove gateway

Change-Id: Ia6721200c1e1f53e20dbe88bccb844ece418dbe3