Merge "Configs: lito: Changes for concurrent record usecase."