Merge "Add measurement API to DefaultContainerService"