Merge "Fix sdk build following Change I4c9763ab"