Update plugin with refactored sdk-common API. DO NOT MERGE.

(Cherry picked from 30b328462ef1f767a940542db23761d6e5b87c0d)

Change-Id: I401ec02d4674739b5f160fc0cf61aebdb9fa6cbf
7 files changed