Register some more extensions

Change-Id: I1e18961ec295fd6eb3bfba3b9bf5638485542fa6
Merge "Register some more extensions"