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

I've taken the name changes but retained prototype and promised here since they are already exposed to SDK users.