Merge "Add CP2 general usage counters to westworld logs." into rvc-dev