Adding missing extensions

Change-Id: I55febcea0c7c9e42b98e76094dada5f659ac7bab
Merge "Adding missing extensions"