Bug 858416 - Create a composite device storage interface. r=dougt
* * *
Bug 858416 - Fix try test failures