Bug 871916 - Remove Nexus S hack in gaia
Merge pull request #11330 from alivedise/bugzilla/871916/remove-nexus-s-hack-in-gaia

Bug 871916 - Remove Nexus S hack in gaia. r=timdream
Bug 908288 - fixing system app intermitent orange failures r=julienw
Merge pull request #11840 from etiennesegonzac/bug-908288-system-test-orange

Bug 908288 - fixing system app intermitent orange failures