Merge "Revert "Camera: Use fully qualified name for camera eviction logic"" into pi-dev