Bug 1104055 - Use promises instead of callbacks
Merge pull request #26612 from wilsonpage/1104055

Bug 1104055 - Use promises instead of callbacks