3.1 changes needed for MobileSprint317Test.