Merge "Use ConfigurationContainer for holding configs in AM hierarchy"