Merge "Edit-conf changes for CLA use case."