Merge "Clean up device identifier access logging" into rvc-dev am: 01be396381

Change-Id: Ie61cb31ffee34703f08a63fe85ebc74c6843fdcb