Updating ExtDist to master

Change-Id: Ib2eab97fc09444565df4779e3264a7dce7248276