Ensure promises wait for proxy callback to resolve

Test: npm run test:all
Change-Id: I9feabe1d4648df14a39f69cbd631d9c1ce64e36d
2 files changed