Merge "Switch required to data to be bundled in host-unit-tests"