Updated with scoping fix for eas_uid

Updated with scoping fix for eas_uid and .h file updates as per
previous changes in the SDK.