Merge commit '35412cf5ab4ae3dc110883dccf7d2ace3b469c58' * commit '35412cf5ab4ae3dc110883dccf7d2ace3b469c58': Fix SDK build breakage.
Merge commit '35412cf5ab4ae3dc110883dccf7d2ace3b469c58' * commit '35412cf5ab4ae3dc110883dccf7d2ace3b469c58': Fix SDK build breakage.