Merge "Ensure process config override tracks the correct activity." into rvc-dev am: a5dc2651f3

Change-Id: I497800c9ef24d04201703fd88c9ffdcec867cf0b