Bug 1093385 fix for sdk/self