Removing extension to be deleted

Change-Id: I9771313e4ba19d52d0950f89cdef1bf2edb816ea
Merge "Removing extension to be deleted"