Update a few extensions to master

Change-Id: I5324ee1587fdbf7a7e233bc836e755207d6b3786