Merge "Disable db_sample logging"