Merge "Migrate to using odlparent:features-test"