Updating Extensions to Latest Masters

Change-Id: I59306a424b1d837abb2ebe1c3c456a15e95da8c7