Do not lock the whole stream to set drop property in valve

Change-Id: I40029fffb150ba5adb3f3f27d5cc944f94911d44