Merge "Fix test failure in NonPhoneDependencyTest.java."