Bug 912839 - Sync SDK changes from bug 910517 to the github repository r=me