Add new extensions

Change-Id: I8cd8b8f5a0fc821d501cddabd90eff72f1ea5225
Merge "Add new extensions"