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

Change-Id: I9bbb3b386e791de5e6d19b6f551c74183888701c