Sync up SDK changes from bug 910517 to the github repository r=me