Merge "Better error message for drop_caches_test" into main