Merge "Allow shell to enable/disable individual component in test package"