Merge "Add SdkExtensions class" am: 0899f50b75 am: af659d8ac4
am: e71a500a08

Change-Id: I5d09d54c59fcda545eb3028bd08cccf33a5cd805