Bug 868706 - Upstream SDK changes from bug 867445 - Remove Test Pilot, r=gavin