Merge "Unified way to provide configurations and env variables(proposal 1)"