Merge "Temporarily revert device identifier access check to previous behavior"