Bug 926367

WIP:

Creating a pull request so bsilverberg can run my tests on his device.