Import extension code

Change-Id: I21f14fb1a370a6fa5c53304b3316a348b64152fe