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

Change-Id: Id184158c4e58f1f985aef68aa67530be774d515f