Merge "Add ConfigInfrastructure lib api tracking files"