Updating extension distributor to master

Change-Id: I62c15ca24d70f324d339c5d204c029eb9e37f192