Merge "Clean up device identifier access logging" into rvc-dev