[Echo][Thanks] Move to the main used extensions

Change-Id: Iee977d8ca80cfaa8fe90e342a18bf0c72863d2d6