Bug 848898: Uplift the changes made by bug 708984 to the SDK repo. r=gozala