Merge "Add e2e test for SdkExtensions" am: 74ff02ce76 am: bbea44ed41

Change-Id: I6e5a78c3b30f7d9a53a7f2487361e6adda832f03