Merge "Ensure process config override tracks the correct activity." into rvc-dev am: a5dc2651 am: 76d6f567 am: f0f6150d Change-Id: Ib74d7e66eb5b6c41cf349c18e69ecfaae771baa6