Merge "Turn off NonPhoneDependencyTest."