Merge "Refactor in preparation for removing android.test.mock"